From b9d7598233d5c903ee4b8e58ba1fd4f3bbe830b7 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Sun, 15 Dec 2013 22:48:01 +0000 Subject: [PATCH] fix some encoding issues with openoffice.style. regenerate internal_styles.cc, deleteing previously deprecated styles. --- gpsbabel/internal_styles.cc | 123 ++------------------------------ gpsbabel/style/openoffice.style | 6 +- 2 files changed, 8 insertions(+), 121 deletions(-) diff --git a/gpsbabel/internal_styles.cc b/gpsbabel/internal_styles.cc index 806959c09..e878685e0 100644 --- a/gpsbabel/internal_styles.cc +++ b/gpsbabel/internal_styles.cc @@ -680,84 +680,6 @@ static char kompass_wp[] = "IFIELD CONSTANT, \"1\", \"%s\" # unknown\n" "IFIELD DESCRIPTION, \"\", \"%s\"\n" ; -static char ktf2[] = - "# gpsbabel XCSV style file\n" - "#\n" - "# Format: Kartex KTF 2.0 Degrees with decimals\n" - "# Author: Harald Nordius\n" - "# Date: 4/13 2006\n" - "#\n" - "# \n" - "DESCRIPTION Kartex 5 Track File\n" - "EXTENSION ktf\n" - "DATATYPE TRACK\n" - "SHORTLEN 10\n" - "SHORTWHITE 1\n" - "#\n" - "#\n" - "# FILE LAYOUT DEFINITIIONS:\n" - "#\n" - "FIELD_DELIMITER COMMA\n" - "RECORD_DELIMITER CRNEWLINE\n" - "#\n" - "#\n" - "# FILE HEADER\n" - "#\n" - "PROLOGUE //Kartex Track File created by GPSBabel\n" - "PROLOGUE &KTF 2.0,sweref 99 lat long,0\n" - "#\n" - "#\n" - "# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n" - "#\n" - "IFIELD CONSTANT, %, \"%s\"\n" - "IFIELD INDEX, \"\", \"%d\"\n" - "IFIELD LATLON_HUMAN_READABLE, \"\", \"%c%f°\"\n" - "IFIELD ALT_METERS, \"\", \"%.2f\"\n" - "IFIELD GMT_TIME, \"\", \"%Y-%m-%d %H:%M:%S\"\n" - "IFIELD IGNORE, \"\", \"%s\" #Empty field\n" - "IFIELD IGNORE, \"\", \"%s\" #Empty field\n" - "IFIELD CONSTANT, \"$\", \"%s\"\n" - ; -static char kwf2[] = - "# gpsbabel XCSV style file\n" - "#\n" - "# Format: Kartex KWF 2.0 Degrees with decimals\n" - "# Author: Harald Nordius\n" - "# Date: 12/08 2004\n" - "#\n" - "# \n" - "DESCRIPTION Kartex 5 Waypoint File\n" - "EXTENSION kwf\n" - "SHORTLEN 10\n" - "SHORTWHITE 1\n" - "#\n" - "#\n" - "# FILE LAYOUT DEFINITIIONS:\n" - "#\n" - "FIELD_DELIMITER COMMA\n" - "RECORD_DELIMITER CRNEWLINE\n" - "ENCODING CP1252\n" - "#\n" - "#\n" - "# FILE HEADER\n" - "#\n" - "PROLOGUE //Kartex Waypoint File created by GPSBabel\n" - "PROLOGUE &KWF 2.0,sweref 99 lat long,0\n" - "#\n" - "#\n" - "# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n" - "#\n" - "IFIELD CONSTANT, \\#, \"%s\"\n" - "IFIELD INDEX,\"\",\"%d\"\n" - "IFIELD SHORTNAME,\"\",\"%s\"\n" - "IFIELD LATLON_HUMAN_READABLE,\"\",\"%c%f°\"\n" - "IFIELD ALT_METERS,\"\",\"%.2f\"\n" - "IFIELD IGNORE, \"\",\"%s\" #Empty field\n" - "IFIELD IGNORE, \"\",\"%s\" #Empty field\n" - "IFIELD CONSTANT, \"0\",\"%s\" #Waypoint symbol code\n" - "IFIELD DESCRIPTION, \"\", \"%s\"\n" - "IFIELD CONSTANT, \"$\", \"%s\"\n" - ; static char land_air_sea[] = "# Format: GPS Tracking Key Pro text file\n" "# Author: Tyler Ritchie\n" @@ -1066,7 +988,7 @@ static char openoffice[] = "#\n" "# HEADER STUFF:\n" "#\n" - "PROLOGUE Index Lat Lon Icon Name Description Notes URL Link Text Altitude (m) Distance (km) Speed (m/s) Course (°) Time HDOP VDOP PDOP Satellites Fix\n" + "PROLOGUE Index Lat Lon Icon Name Description Notes URL Link Text Altitude (m) Distance (km) Speed (m/s) Course (°) Time HDOP VDOP PDOP Satellites Fix\n" "#\n" "# INDIVIDUAL DATA FIELDS:\n" @@ -1074,10 +996,10 @@ static char openoffice[] = "IFIELD INDEX, \"\", \"%d\"\n" "IFIELD LAT_DECIMAL, \"\", \"%f\"\n" "IFIELD LAT_DIR, \"\", \"%c\"\n" - "IFIELD LAT_HUMAN_READABLE, \"\", \"%d° %f' %c\"\n" + "IFIELD LAT_HUMAN_READABLE, \"\", \"%d° %f' %c\"\n" "IFIELD LON_DECIMAL, \"\", \"%f\"\n" "IFIELD LON_DIR, \"\", \"%c\"\n" - "IFIELD LON_HUMAN_READABLE, \"\", \"%d° %f' %c\"\n" + "IFIELD LON_HUMAN_READABLE, \"\", \"%d° %f' %c\"\n" "IFIELD ICON_DESCR, \"\", \"%s\"\n" "IFIELD SHORTNAME, \"\", \"%s\"\n" "IFIELD DESCRIPTION, \"\", \"%s\"\n" @@ -1182,41 +1104,6 @@ static char saplus[] = "IFIELD URL, \"\", \"%s\" # URL\n" "IFIELD IGNORE, \"\", \"\" # Holder for Geocache Type\n" - ; -static char sportsim[] = - "# gpsbabel XCSV style file\n" - "#\n" - "# Format: Sportsim track files\n" - "# Author: Olaf Klein\n" - "# Date: 07/05/2006\n" - "#\n" - "DESCRIPTION Sportsim track files (part of zipped .ssz files) \n" - "EXTENSION txt\n" - "DATATYPE TRACK\n" - - "#\n" - "# FILE LAYOUT DEFINITIIONS:\n" - "#\n" - "FIELD_DELIMITER SEMICOLON\n" - "RECORD_DELIMITER CRNEWLINE\n" - "BADCHARS TAB\n" - - "#\n" - "# FILE HEADER\n" - "#\n" - "PROLOGUE SportsimVersion:01\n" - "PROLOGUE \\#Sportsim TrackFile\n" - - "#\n" - "# INDIVIDUAL DATA FIELDS:\n" - "#\n" - "IFIELD INDEX, \"\", \"%05d\"\n" - "IFIELD CONSTANT, \"0\", \"%s\"\n" - "IFIELD LAT_DECIMAL, \"\", \"%f\"\n" - "IFIELD LON_DECIMAL, \"\", \"%f\"\n" - "IFIELD ALT_FEET, \"\", \"%.f\"\n" - "IFIELD TIMET_TIME, \"\", \"%ld\"\n" - "IFIELD CONSTANT, \";\", \"%s\"\n" ; static char tabsep[] = "# gpsbabel XCSV style file\n" @@ -1461,8 +1348,8 @@ static char xmapwpt[] = "IFIELD IGNORE, \"\", \"%-.31s\"\n" "IFIELD DESCRIPTION, \"\", \"%-.78s\"\n" ; -style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap2006", xmap2006 } , { "xmap", xmap } , { "tomtom_itn_places", tomtom_itn_places } , { "tomtom_itn", tomtom_itn } , { "tomtom_asc", tomtom_asc } , { "tabsep", tabsep } , { "sportsim", sportsim } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "ricoh", ricoh } , { "openoffice", openoffice } , { "nima", nima } , { "navigonwpt", navigonwpt } , { "mxf", mxf } , { "motoactv", motoactv } , { "mapconverter", mapconverter } , { "mainnav", mainnav } , { "land_air_sea", land_air_sea } , { "kwf2", kwf2 } , { "ktf2", ktf2 } , { "kompass_wp", kompass_wp } , { "kompass_tk", kompass_tk } , { "igo2008_poi", igo2008_poi } , { "iblue757", iblue757 } , { "iblue747", iblue747 } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "geonet", geonet } , { "garmin_poi", garmin_poi } , { "garmin301", garmin301 } , { "fugawi", fugawi } , { "flysight", flysight } , { "dna", dna } , { "custom", custom } , { "cup", cup } , { "csv", csv } , { "cambridge", cambridge } , { "arc", arc } , {0,0}}; -size_t nstyles = 40; +style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap2006", xmap2006 } , { "xmap", xmap } , { "tomtom_itn_places", tomtom_itn_places } , { "tomtom_itn", tomtom_itn } , { "tomtom_asc", tomtom_asc } , { "tabsep", tabsep } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "ricoh", ricoh } , { "openoffice", openoffice } , { "nima", nima } , { "navigonwpt", navigonwpt } , { "mxf", mxf } , { "motoactv", motoactv } , { "mapconverter", mapconverter } , { "mainnav", mainnav } , { "land_air_sea", land_air_sea } , { "kompass_wp", kompass_wp } , { "kompass_tk", kompass_tk } , { "igo2008_poi", igo2008_poi } , { "iblue757", iblue757 } , { "iblue747", iblue747 } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "geonet", geonet } , { "garmin_poi", garmin_poi } , { "garmin301", garmin301 } , { "fugawi", fugawi } , { "flysight", flysight } , { "dna", dna } , { "custom", custom } , { "cup", cup } , { "csv", csv } , { "cambridge", cambridge } , { "arc", arc } , {0,0}}; +size_t nstyles = 37; #else /* CSVFMTS_ENABLED */ style_vecs_t style_list[] = {{0,0}}; size_t nstyles = 0; diff --git a/gpsbabel/style/openoffice.style b/gpsbabel/style/openoffice.style index 9ba62534a..ee2d30934 100644 --- a/gpsbabel/style/openoffice.style +++ b/gpsbabel/style/openoffice.style @@ -17,7 +17,7 @@ BADCHARS TAB # # HEADER STUFF: # -PROLOGUE Index Lat Lon Icon Name Description Notes URL Link Text Altitude (m) Distance (km) Speed (m/s) Course (°) Time HDOP VDOP PDOP Satellites Fix +PROLOGUE Index Lat Lon Icon Name Description Notes URL Link Text Altitude (m) Distance (km) Speed (m/s) Course (°) Time HDOP VDOP PDOP Satellites Fix # # INDIVIDUAL DATA FIELDS: @@ -25,10 +25,10 @@ PROLOGUE Index Lat Lon Icon Name Description Notes URL Link Text Altitude (m IFIELD INDEX, "", "%d" IFIELD LAT_DECIMAL, "", "%f" IFIELD LAT_DIR, "", "%c" -IFIELD LAT_HUMAN_READABLE, "", "%d° %f' %c" +IFIELD LAT_HUMAN_READABLE, "", "%d° %f' %c" IFIELD LON_DECIMAL, "", "%f" IFIELD LON_DIR, "", "%c" -IFIELD LON_HUMAN_READABLE, "", "%d° %f' %c" +IFIELD LON_HUMAN_READABLE, "", "%d° %f' %c" IFIELD ICON_DESCR, "", "%s" IFIELD SHORTNAME, "", "%s" IFIELD DESCRIPTION, "", "%s" -- 2.30.2